Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

3.13.x: upgrade Redbug to 2.1.0 (backport #12484) #12494

Merged
merged 3 commits into from
Oct 8, 2024
Merged

3.13.x: upgrade Redbug to 2.1.0 (backport #12484) #12494

merged 3 commits into from
Oct 8, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 8, 2024

The PR is by @SimonUnge.

This is an automatic backport of pull request #12484 done by Mergify.

@SimonUnge @mergify
Dependency Redbug updated from 2.0.7 to 2.1.0
85fa174 
(cherry picked from commit 770dfd6)

Conflicts:
	rabbitmq-components.mk
(cherry picked from commit c348501)

# Conflicts:
#	rabbitmq-components.mk
@mergify mergify bot added the conflicts label Oct 8, 2024
@mergify Mergify
Copy link
Author

mergify bot commented Oct 8, 2024

Cherry-pick of c348501 has failed:

On branch mergify/bp/v3.13.x/pr-12484
Your branch is up to date with 'origin/v3.13.x'.

You are currently cherry-picking commit c348501db2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   MODULE.bazel
	modified:   bazel/BUILD.redbug

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rabbitmq-components.mk

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@michaelklishin michaelklishin changed the title 4.0.x: upgrade Redbug to 2.1.0 (backport #12484) 3.13.x: upgrade Redbug to 2.1.0 (backport #12484) Oct 8, 2024
@michaelklishin michaelklishin merged commit 94ccc8a into v3.13.x Oct 8, 2024
262 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v3.13.x/pr-12484 branch October 8, 2024 23:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@michaelklishin michaelklishin

Labels
bazel conflicts make
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@michaelklishin @SimonUnge